fix for ticket 29