(hopefully) fixed submodules