Add a hack to avoid end of line characters issue between OS