Attempt to fix issue #90

Works with Cygwin64 on Windows 8.1 and did not produce additional errors OS X and Debian. I still hope that this did not break something else. :)