Now compiles on MacOS