package fix + SMAnalyser fix