fix mac and so on...