Possible entity ID fix?