This check is a lot better