Fix ForEntities?