fix destroy all bugs