Implementation of bugid 106325