Fix analysis 2