Now works on OS X