Fixed bug #23234