Fix fabric (17/23)

Fix fabric