bugfix, solution class