Fixed the problem that entries were sometimes not found