Timer management fix.