fixing missing company from messages v16