Fix migration of draping utility function