Fixes (Again!)
Merge pull request #1033 from Mexahoid/patch-32

Fixes (Again!)