[Fabric 007] tool work improvement repair