Bugfix in parser