This should hopefully speed up the checks