Make syntax check stricter