For PR1195: