Refixed race condition and cue