Fixed small error in Solver.
Revert "Fixed small error in Solver."

This reverts commit 67efcf66221a81851ab5b569f8f38c63a3e13471.
Fixed small error in Solver recommit
Merge remote-tracking branch 'origin/nathan'