Fixing D-10926
Merge pull request #231 from mattkovacs/master

Fixing D-10926: Missing Entries