Make check stricter