Fixed JNAPC-295