restore working wrapper
update rescue key option