Fix fabric (7/23)

Fix fabric