Fix Ticket #6277