Timer bug fix for 0.3.x