Fixed bug in parser