Fix PR1517: