JAD7915-1424

Enforced returns