Fix bug 21832