form bugfixing