Fixed normal_form