Fix up weft management