diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs
index 7dd4f9b0..b92e3078 100644
--- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs
@@ -3251,7 +3251,12 @@ namespace VEPROMS.CSLA.Library
 				prevTbFormat = MyPrevious.IsInRNO ? prevStepData.TabData.RNOIdentPrint : prevStepData.TabData.IdentPrint;
 				prevTbFormat = ReplaceStepToken(prevTbFormat);
 			}
-			if (NextItem != null)
+			bool specialCalvertAlarm = false;
+			if (ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvertAlarm)
+			{
+				if (GetNextItem() != null && MyContent.Type != GetNextItem().MyContent.Type) specialCalvertAlarm = true;
+			}
+			if (NextItem != null && !specialCalvertAlarm)
 			{
 				nextStepData = NextItem.FormatStepData;
 				// tried to duplicate functionality from 16-bit code.
@@ -3361,8 +3366,8 @@ namespace VEPROMS.CSLA.Library
 			// tabbing correctly.
 			if (ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvertAlarm)
 			{
-				if (MyPrevious != null && MyContent.Type != MyPrevious.MyContent.Type) return true;
-				if (GetNextItem() != null && MyContent.Type != GetNextItem().MyContent.Type) return true;
+				if (MyPrevious != null && MyContent.Type != MyPrevious.MyContent.Type) return false;
+				if (GetNextItem() != null && MyContent.Type != GetNextItem().MyContent.Type) return false;
 			}
 
 			if (!FormatStepData.MixCautionsAndNotes) return false;