Bugfix in solving--turns out it's slow