BUC5145-2340

Enforced returns