Yeah, probably. I'm just wrapping up testing and am about to merge, I'll make this change if necessary.

This is really well done, thanks!