Timer bugfix