Close GH-664: Fix for some windows users. Fixes #626