Hopefully fixed submodules for real.