Better support for mac