Ticket #61 - fix