scw multi class bug fix