For PR1145: