Improve portablity