Timer management fix