Timer Bug fixed