finally get rid of Analysis class
fix NPE