Suggested fix for ticket 21223