For PR1090: