Just fixed timing issues