Fixed Bugs related to resetting the timer