fix for ticket 31