fix double chest handling