For PR1137: