Trying to fix timing issues