Fixed windows support