Fixed validation...broke persistence.