Do a better Mavericks check