Bug fix in parser