Improved handling of defeat