Fix Solver::AddSuffix