Fixed bug #23830