fix Teardown & added hex