Adding fix for Mavericks