Try to fix Wrap.Function some more