Resolves Ticket #46