Fixed conversion to full_form