Fix bug #21759