Fixed Timing Issue