Fixed cross-OS issue