Fix for Mavericks