Fix bug #6603.