fix context mapper