Only needs one more check