Make stricter