add proper calf handling (mac)