fix for ticket 555