Fix big race condition between form submit and StoreBoxes