Fix problem in parser