Solver bugfixes
Solver funny bugfix