Timing Bugfix