Fixed timing issues.