surrender bugfix
Merge