fix for ticket 22