Resolved bug in wrapper logic.