solve bug 35