ahhhh, just saw your PR description. Once we get this fixed then we can merge this in, if that's alright with you :)