Fixes issue with Mavericks