FOS2508-3915

Enforced returns