Fix fabric (4/23)

Fix fabric