Resolves Ticket #6