Bugfix for entries lower than treshhold.
Merge branch 'hotfix/1.4.2.1_3.1'