user1 fix bug 3.0