Fixed timing issues