Merge pull request #2386 from BrzVlad/fix-jit