Fixed a bug with the solver I accidently introduced over the last few commits