Solve Timer issue