Fixed for OS X