Fix: for multicompany compatibility