diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs
index 4629d79d..47a892bf 100644
--- a/PROMS/Volian.Print.Library/vlnParagraph.cs
+++ b/PROMS/Volian.Print.Library/vlnParagraph.cs
@@ -5302,9 +5302,10 @@ namespace Volian.Print.Library
 			}
 			// F2021-025: Barakah single column no blank line between last Note/Caution/Warning text and bottom line of box
 			// C2021-049: Barakah no blank line between last Note/Caution/Warning text, include sub-step text by using 'IsInCautionOrNote' 
+			// B2022-017: Barakah within note/caution, if note has substeps, there should be a blank line between note & 1st substep
 			if (MyItemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.NoBlankLastNoteCautionWarn && (MyItemInfo.IsInCautionOrNote))
 			{
-				if ((MyItemInfo.NextItem == null) || (MyItemInfo.MyContent.Type != MyItemInfo.NextItem.MyContent.Type)) return 0;
+				if ((MyItemInfo.Steps == null || MyItemInfo.Steps.Count == 0) && ((MyItemInfo.NextItem == null) || (MyItemInfo.MyContent.Type != MyItemInfo.NextItem.MyContent.Type))) return 0;
 			}
 
 			if (MyItemInfo.Ordinal % everyNLines == 0 || MyItemInfo.NextItem == null) return SixLinesPerInch;