Fix fabric (19/23)

Fix fabric