Make mac pass a singleton