Moved "if-then" condition for type="combine"