Fix teardown