Return to Deck loses oldLocation in Report Action

I’ve got a set up like this

(prototype) → (card A)

The prototype has a Report Action, monitoring the CTRL+D keystroke
Card A has a “Return to Deck” trait, which is assigned to CTRL+D.

When “Return to Deck” is used, the Report Action is fired but the oldLocation is reported as “offboard”. I’ve tried to change the ordering of traits and so on but I haven’t got it to report the old location as expected. Is there a trick to doing this? It seems like internally to Vassel the code is running the CTRL+D after the deletion so there’s not a lot I can do about the natural ordering other than a workaround. Do I need to set a value on Card A of the location on placement and then report that on Return to Deck?

Thanks.