fixed all forms