fixes on entity convert