Fix 'dcs'
Fix infinite loop in analysis