temp commit
Resovle timer race.