Prevent possible time-funk

Change-Id: I113e2d12c83241d680871937fe86cbfe3ad7f201