Fixing for mac