Bugfix with entity fetching