Fix bug 11390