EntityRetriever bugfix