some fix on Solver