Should now work correctly on Windows as well