Fixed issue where timer wasn't working correctly