Fix bug #4730: