Fixes JNAPC-291