correct mapper code