timing issues corrected