[BUG #8811] Hotfix