I want to merge your changes into my fork

I was working on a fix for this problem myself, but yours is better