v0.6.67 Fixed form generation