Should now work on Windows