Fixed Ticket #6