Fixed: not working on Mac OS X