Trying to correct timing issues