BG/CF - Fixed Crash in Queue again