Strengthen sanity check