fix context mapping