Attempting a fix for origin/#4, havent tested on Windows yet