Forms bug fix