Should fix #830
Merge pull request #844 from RlonRyan/patch-6

Should fix #830