julia

alternate fix for #29936 that handles more cases

#31344

Merged