Fix: NONAT-T10-R026