Fix 'fish shell' issue
Submodules magic pt.1