Fix regression in model class checking