Fix crash with new BC.