multi class version fix