Solve bug