Fix remote type for < R17