Resolves JNAPC-317