reverting to more-correct class determination