fix for fronted_company merge part 2