Fixed #13 by moving seralized form values into save loop