More checks to avoid reruns