Merge bug fix on zSetSolve from working to main