Resolves JNAPC-326