IMP multicompany fix