Fix bad work findEntity