fix on entity controller