Bug fix in parser II