Added special case to entity matching. Fixes #3.