Fixing incorrect handling of company name