Fix: Check for entries number