For PR528: