Fix for OS X Mavericks