Analysis fix