fix bug 177,160,158