Bug fix 79463986