fix mapping policy semantics