Ticket #7 fix