Use wraps to preserve name, fixes #55