Fixed broken solver