Analysis fix 3