Modify for w32