fixed hasOne & belongsTo