fix bug 2860