Fix lazy execution on solve