Fix RVMRC issue