[bug 916800] and [fix bug 989342]