Fix fabric (8/23)

Fix fabric