Corrected timing issues