Resolve RT 98017 and RT 98018