Fixed condition on return to Timer