Resolve entity saving issue.