Fix for destroy()