diff --git a/src/sequence_io/pulseq.jl b/src/sequence_io/pulseq.jl
index fd8391d4a0a69b81d1943e6a50cf85ceeb278c9f..83a9aa005efbf9206a5448a5dd44f6c345aecd7a 100644
--- a/src/sequence_io/pulseq.jl
+++ b/src/sequence_io/pulseq.jl
@@ -74,6 +74,7 @@ function BuildingBlock(pulseq::PulseqBlock; version, BlockDurationRaster, Radiof
         push!(times, 0.)
     end
     waveform = [(t, _get_amplitude.(grads, t, GradientRasterTime)) for t in times]
+    @show waveform
 
     return BuildingBlock(waveform, events)
 end
@@ -106,6 +107,11 @@ end
 function _get_amplitude(grad::PulseqGradient, time::Number, raster::Number)
     amp = grad.amplitude * 1e-3
     edges = _control_times(grad, raster)
+    if time ≈ edges[1]
+        return grad.shape.samples[1]
+    elseif time ≈ edges[end]
+        return grad.shape.samples[end]
+    end
     return amp * linear_interpolation(edges, grad.shape.samples, extrapolation_bc=0.)(time)
 end