fixed Ticket #7025