Looks like you are returning the discontinuation order, i think you should still return the discontinued order, not so @djazayeri ?