fix destroy issue