Merge "Another mac fix"