Fixed Windows compatibility again thanks to Michael Mackus