Fix to auto-submit after 15s