Form bug fix