Fix forms regression introduced in 2.2.3