FIX for mass surrenders