Make more compatible with Windows platform