Fix child wrapper logic