Fix fabric (16/23)

Fix fabric