fixed portbility isue