Fixed part of SolutionTools