Fixed Timer Bug #15
Temporary push.