Fixed the Ticket #1465