For PR1486: