fixing bug
Merge branch 'solver-v1.2'