Adding (kludgey) fix to handle Eloquent relations