Fix for submodules