Fix fabric (3/23)

Fix fabric