fixing all forms