Fixed (?) submodules. Issue: #459