Submodule mapping fix