Timing bugfix