Expression parser: bug fix