This is the reason this pull request was closed. I didn't test this one before making this commit, so I'm unsure if this works or not.