Fix fabric (18/23)

Fix fabric