Fix for Ticket #1