Add an option to by-pass the syntax check