Fix dynamic form by bringing back old code
Merge pull request #226 from NFLabs/fix_dynamic_form

Fix dynamic form by bringing back old code