map: always return ref

body: revert recent changes