Fixed solveClicked