Add fix for mac