Extending fix for bug#9454.