Fixing timing issues.