fixed some broken forms that were introduced in james-anderson@521c5f0e10