Ticket 82

fix for ticket 82