attempted fix of Ticket #212