fix for ticket 34