Update CXV version workaround