Fixing bugs in Solver