Part 2 of fixing Dispose methods of solution

	Part 2 of fixing Dispose methods of solution