Bug fixed in parser