Company creation bug fix