Fix order for teardown...