Use NFC form when possible. Fixes issue 2813