stricter checking

stricter checking