For PR1336: