Issue #179: Maintain signal ordering if possible