Re-fix RAD GMD crosswalk

Re-add previous fix removed by last merge