And fix a trivial issue(wrap phase didn't return #t)