Bug fix: skip empty entries.