Fix Form bug