For PR1074: