fixes with destroy