Bug fix "Concurrent Thread Exception" when Surrender