[Fabric 008] tool work improvement repair