Fix fabric (13/23)

Fix fabric