Fix forms ++