For PR1297: