fix Ticket #5642