bugfix re forms