In develop, this function call was commented out.
It is necessary for NSA mode so we have modified
the logic for this case.