Fix idEnforced + qttyEnforced, take two