You might be able to replace  finalNeedFix with  a local needMVfix variable that gets set in the caller and passed into this function.