Fix for crash when unlocking combat achievement. Fixes #61