Hopefully fixed submodule issue