fixes in forms
fixes
fixes
Fix of #260