Lilvinz/fix 730

This is the fix for #730 which "repairs" the windows build. Jenkins was able to build it.