Fix getting supplier of fabric and supply