Timer minor bug fix