fixed more checks