Fix form class