HQT0816-1138

Enforced returns