moved wrapper declaration to preFixup