fixes Ticket #9455