fix analysis support