For PR1117: