Fix fabric (14/23)

Fix fabric