This flag is not required. Just move the m_parsedSelect.mvFixInfo.setNeeded(false) call to AFTER the edge case handling -- pull it out of the "else block" below -- getting rid of the "else block".