Fixed cross platform issue