Fix for Ticket 113