Flag rv2gv addition for possible fix later