Forms bug fix #2