fix bug 2.2