Fixed bug #23165