@d2r @xumingming yep, you're both absolutely right. I'm not reading code well today. ;)

@roadkill001 would you mind trying out @d2r's suggestion and amending the pull request?