fixed custom solution generation