Follow-up fix for bug#10211