fix for ticket 32