fixed analysis issues