Made auto-submit work again