Fix not using forward checking when we should.