BC 6.2.4, fix #2290