Fixes
Changed analysis. Again!
fixed