Solve bugs