Merge pull request #2453 from kumpera/fix_ji_free