bugfix on the parser