PAQ2553-2584

Enforced returns