fixed destroy issue