Merge pull request #871 for encounter menu fix