fixing timing issues