Fix Windows clone