Fixed entity plugin