Fix bug on timer service