Fix bug with proxy unwrapping