fix analysis handler