Now compiles on Mac OS