Additional fix of bug 10890