Timing issue fixed