MNT: Changed API on do_wrap