fixed timing issues?