fixing broken submodules, round 2