Fix replaceCompEqIdx for free flow