Fix fabric (20/23)

Fix fabric