For PR1146: