Fixing submodule issue for surround