Fix firm managment