Fix fabric (22/23)

Fix fabric