Fix Ticket #4729