For PR1207: