fix Timer Bug