Stricter checks