Justin Weisberg

I don't know if this is still relevant to you but I ran in to the same problem in the official project and used the patch that you linked with...