Fixed for OS X Mavericks