take entity fix