Fixed a bug with the timer