Also fix submodule configuration or the previous commit is useless