Fixed Ticket #4535