Fixed destroying issue