Better fix for bug #67072 with more BC provisions