diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs
index 0cba51ec..32c31345 100644
--- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs
@@ -3962,8 +3962,10 @@ namespace VEPROMS.CSLA.Library
 			// treat cautions and notes as different if they are all NOT exactly the same type
 			if (ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.OnlyBulletSameCautionNoteType)
 			{
-				if (MyPrevious != null && MyPrevious.MyContent.Type != MyContent.Type) return true;
-				if (NextItem != null && NextItem.MyContent.Type != MyContent.Type) return true;
+				if (MyPrevious != null && MyPrevious.MyContent.Type != MyContent.Type && 
+					((MyPrevious.IsCaution && this.IsCaution) || (MyPrevious.IsNote && this.IsNote))) return true;
+				if (NextItem != null && NextItem.MyContent.Type != MyContent.Type && 
+					((NextItem.IsCaution && this.IsCaution) || (NextItem.IsNote && this.IsNote))) return true;
 			}
 
 			if (!FormatStepData.MixCautionsAndNotes) return false;