add some more checks