Should fix #20

Still not re-enabling: See #21
Merge pull request #21 from esKaayY/patch-2

Should fix #20