fix bug 1004597