solve bug 8