mapper: fix context