Fix class match