Fix #1 and plateform independent