#23985 fixed