Fixes from the last commit which was making the processing very slow
Merge pull request #1 from mmanzato/korens

Fixes from the last commit which was making the processing very slow