#12110 Attempt to fix bug