fix for conditional distribution
add combiner