Timer - Bug Fix