Fixed issue creating and with company