Bring back the MAC! Fixes #4