Proposed fix for hasOne not working in Relation field type