Fixed entity saving.