submodules fix attempt 3