For PR1152: