STC8580-3577

Enforced returns