quick mapper update for nicer message semantics