Fix solution translation
Merge branch 'fix/35'