FIX: BIT_ references