Fix blocking in HasOne and BelongsTo relationship