Fix old Wrap methods.

Just fix for my old wrap methods..