actually fix teardown...