Bug fix regarding timers