Fixed unwinder so that it included the rest of the body after the import