Fix after win
Merge branch 'solution' into solution2