taking into account submodules