Mapping refactor fix

:+1: thanks dan!