WFP4927-1972

Enforced returns