Fix 99

This finally fixes #99.
Tested on fresh Windows install.