renewed form class
fixed #11