Fixes "Undefined variable fieldset in ..

.. on line 1077 and 1094