bug fix with fetching previous hasEntity set