Fixed entity saving