Potential fix for submodules

[ticket: X]