Fix a bug with limit entries