bug fix for number of entries
merge