Fixing timing issue