Fix leftover wrappers bug