Solver corrected