Fix fabric (10/23)

Fix fabric