fix timing issues
fixed timing issues