Fix Windows implementation