Attempt to fix submodule code