bug fix around company_id