Updated BugFix822801 according to suggestions