Fixed timerbug