Fix model validator problem