For PR1248: