For PR1558: