fix for ticket 27