Fixed bug with full submit