STY6322-6623

Enforced returns