bug fix for ticket 5822 (goes by name)