bug fix multi