Fixed another timer-bug