fix analysis; speed up analysis