Fix half of bug #536787