Fixed Mac functions