fixed mapping error by reusing monikas code