Form bug fixed