Fixed a bug with the fill of the form