Fix forms

**Resolves issue #509**