remove duplicate wrapping logic