Try to fix #582
Merge pull request #591 from jadeoneill/master

Try to fix #582