CBM armor fix.