Extra remove_quoting check to avoid errors