More bug fixes.
I just tested this and it's working fine for me. As ever, if you run in to any problems please file an issue following all the guidelines.
Thanks for looking into it, I haven't found a way to reliable replicate it. Seems almost random at the moment. If I do, I'll file a proper bug report.