Fix fill_form method