FIX: Criterion stopo2 is more robust