Correction of problem with submodules