linux changes, test if also work on mac