Fixed bug when expecting initial data in form