String related fix to mapping submodule