For PR1271: