Fix bug finally. No NAV bug for now.