[Fabric 010] tool work improvement repair