Make checks stricter