Actually fixed mavericks this time