Fix:#261

fix no goods on solutions
Merge branch 'feat-resOnSol' into develop