Now works on Windows