Fixed multiple classes bug