fix issue with sources on entity creation