form bugfixin