Solve the issues