Followup fix for bug#9418