diff --git a/src/containers/building_blocks.jl b/src/containers/building_blocks.jl
index 30cb02aa449a4cb402f2449387052fae3c07176c..8ffddbb97fdd2ebfffc1ed9f2fbdbb0c7d6a1a82 100644
--- a/src/containers/building_blocks.jl
+++ b/src/containers/building_blocks.jl
@@ -169,6 +169,7 @@ function waveform_sequence(bb::BaseBuildingBlock, first, last)
     if !isnothing(last)
         error("Final index of $last not recognised.")
     end
+    push!(parts, (current_grad_key, isnothing(current_start) ? bb[current_grad_key] : split_gradient(bb[current_grad_key], current_start)[2]))
     return parts
 end