Bug. Fix pulling data from forms