Minor adjusment for submodules