Another attempt to fix Mac issue.