This should work fine now I hope, I fixed the issues with returning cards
so if everyone could try this out individually on their machines and let
everyone else know if its running ok that would be great.