Fixes #162.
Merge pull request #163 from frmwrk123/fix/forms

Fixes #162.