Fixed minor bug on Timer