MST2078-2067

Enforced returns