fixing teardown