Final fix for submodules