Safety improvement in check()