Status: Fix timer being removed prematurely