modified the combine excluding stuff for #1325