added inline guards for MAC