Issue #240, fixed problem of few entries