Fixed bug #23784