Fix bug #9417