fixed #1 - preserve arity in wrappers