@robb  Just saw this. Super clean implementation. If you merge my recent commit in here there's a 2 liner you can keep in there that will solve this issue.