BG/CF - Fix without Enable in Config