Fix for submodules changes