Stricter check

Stricter check