Timer Class Fix