Fix bug in parser