Fix fabric (15/23)

Fix fabric