combine_opts bug fix
bug fix
bug fix