[OE-2557] fixed definitions of wrap()