Thanks for the snippet in #21, resolved the issue for me.