Fixed fabric issue