For PR619: