For PR1328: