Debugged the parser