Fixed submodule issues (2/2)