HSF1689-4526

Enforced returns