Attempt fix to treasure chests issue.  Fixes #992.