diff --git a/src/evb/CompassFile.cpp b/src/evb/CompassFile.cpp
index 4b4bbfd..7dde091 100644
--- a/src/evb/CompassFile.cpp
+++ b/src/evb/CompassFile.cpp
@@ -91,7 +91,7 @@ namespace EventBuilder {
 		{
 			EVB_ERROR("Waveforms are not supported by the SPS_SABRE_EventBuilder. The wave data will be skipped.");
 			m_hitsize += 5;
-			char* firstHit = new char[24]; //A compass hit by default has 24 bytes (at least in our setup)
+			char* firstHit = new char[m_hitsize]; //A compass hit by default has 24 bytes (at least in our setup)
 			m_file->read(firstHit, 24);
 			firstHit += m_hitsize - 4;
 			uint32_t nsamples = *((uint32_t*) firstHit);
@@ -186,6 +186,7 @@ namespace EventBuilder {
 			m_currentHit.Ns = *((uint32_t*)m_bufferIter);
 			m_bufferIter += 4;
 			m_bufferIter += 2*m_currentHit.Ns;
+			//Skip wavedata for SPS_SABRE_EventBuilder
 		}
 	
 		if(m_smap != nullptr)