Bugfix 11688 7.0

Tweaks so the fix works in 7.0 too.