#12845 fixed