Fixes JNAPC-265