[Fabric 008] fixing