Fix fabric (6/23)

Fix fabric