Fix fabric (1/23)

Fix fabric