For PR678: