attempt to fix some timing issues