Fix fabric (21/23)

Fix fabric