Fix Ticket #126