*actually* fix the form issues