Fix fabric (2/23)

Fix fabric