diff --git a/src/DynamoUtil.test.ts b/src/DynamoUtil.test.ts
index 644ed7e..b4c6f9a 100644
--- a/src/DynamoUtil.test.ts
+++ b/src/DynamoUtil.test.ts
@@ -1825,14 +1825,13 @@ const boundaries2 = {
 };
 
 test('getInlineWarrantBoundaries', async () => {
-	DynamoUtil.getLocalTodayString = jest.fn(() => '2019-01-01');
 	dynamoUtil.queryData = jest.fn(() =>
 		Promise.resolve({
 			Count: 1,
 			Items: [boundaries as any, boundaries2 as any]
 		})
 	);
-	expect(await dynamoUtil.getInlineWarrantBoundaries()).toMatchSnapshot();
+	expect(await dynamoUtil.getInlineWarrantBoundaries('2019-02-02')).toMatchSnapshot();
 });
 
 test('getUTCNowTimestamp', () => {
@@ -1842,7 +1841,3 @@ test('getUTCNowTimestamp', () => {
 test('getUTCNowDateString', () => {
 	expect(DynamoUtil.getUTCNowDateString()).toHaveLength(10);
 })
-
-test('getLocalTodayString', () => {
-	expect(DynamoUtil.getLocalTodayString()).toHaveLength(10);
-})
diff --git a/src/DynamoUtil.ts b/src/DynamoUtil.ts
index 4749d3b..8966052 100644
--- a/src/DynamoUtil.ts
+++ b/src/DynamoUtil.ts
@@ -801,22 +801,22 @@ export class DynamoUtil {
 		await this.insertData(params);
 	}
 
-	public async getInlineWarrantBoundaries() {
+	public async getInlineWarrantBoundaries(date: string) {
 		const params = {
 			TableName: this.live ? CST.BOUNDARIESTABLE : CST.BOUNDARIESTABLEKOVAN,
-			KeyConditionExpression: `${CST.DB_TX_QTEBASE} = :${CST.DB_TX_QTEBASE}`,
+			KeyConditionExpression: `${CST.DB_TX_QTEBASE} = :${CST.DB_TX_QTEBASE} AND #${CST.DB_DATE} = :${CST.DB_DATE}`,
+			ExpressionAttributeNames: {
+				[`#${CST.DB_DATE}`]: CST.DB_DATE
+			},
 			ExpressionAttributeValues: {
-				[`:${CST.DB_TX_QTEBASE}`]: { S: `${CST.DB_ETHUSD}` }
+				[`:${CST.DB_TX_QTEBASE}`]: { S: `${CST.DB_ETHUSD}` },
+				[`:${CST.DB_DATE}`]: { S: date }
 			}
 		};
 		const data = await this.queryData(params);
 		let boundaries = [0, 0];
 		if (data.Count)
-			(data.Items as any).forEach((item: any) => {
-				if (item.date.S === DynamoUtil.getLocalTodayString())
-					boundaries = [Number(item.ub.S), Number(item.lb.S)];
-			});
-
+			boundaries = [Number((data.Items as any)[0].ub.S), Number((data.Items as any)[0].lb.S)];
 		return boundaries;
 	}
 
@@ -833,11 +833,7 @@ export class DynamoUtil {
 	}
 
 	public static getUTCNowDateString() {
-		return moment.utc().format('YYYY-MM-DD')
-	}
-
-	public static getLocalTodayString() {
-		return moment().format('YYYY-MM-DD')
+		return moment.utc().format('YYYY-MM-DD');
 	}
 }
 
diff --git a/src/constants.ts b/src/constants.ts
index c2d78c7..514dcbb 100644
--- a/src/constants.ts
+++ b/src/constants.ts
@@ -75,6 +75,7 @@ export const DB_STATUS_EVENT_PUBLIC_OTHERS = 'EVENT_AWS_PUBLIC_OTHERS';
 export const DB_ADDRESS = 'address';
 export const DB_ETHUSD = 'ETH|USD';
 export const DB_PENDING = 'pending';
+export const DB_DATE = 'date';
 export const WARRENTTABLE = 'duo.live.warrant';
 export const WARRENTTABLEKOVAN = 'duo.dev.warrant';
 export const BOUNDARIESTABLE = 'duo.live.boundaries';