[Fabric 014] tool work improvement repair