Fix bug with multiple forms