Fix auto-submit