fixed timing issues