fix validation...