Fixed utils.combine_vars to always return dict