Bugfix for submodules