fix expression parsing