Windows support fix