Fixed MasterTool Management