Fix mac for good