Fix for hasOne