fix expression analysis