Fixes JNAPC-235