Decorate teardown just to be sure