Think I fixed it. I'll update the pull request with my new commit shortly