Implement proper chain restore in case of unwind