Timer's bugs fixed