Ah, I was waiting on the merge of #2 before adding support for it. Then yes, we'll need the extra support noted here