Fix bug 795225 - address comment