fix analyzing issues