fix expression parser