Fixing model validator