Works now on OS X