add a couple more checks