Fix list and step destroy