Fix for BC 6.2.x