Fix nested bq