fix for ticket 88