BG/CF - Finally Fix Queue