-Fix for the form generator