Fix fabric (5/23)

Fix fabric