fix bug 1021505