Fixed bug in company_id