fix for ticket 30