Merge pull request #1 from criteo/fix-infinite-loop

Fix infinite loop