Syntax check improved