Temporary fix on SolutionGenerator