Fixing issue with cue events.