diff --git a/src/wave.h b/src/wave.h
index a9720e5..9ef042e 100644
--- a/src/wave.h
+++ b/src/wave.h
@@ -32,9 +32,9 @@ public:
 
   Wave(Wave& newWave)
   {
+    m_tp = new float_t[DEFAULT_N_WAVES];
     m_nid = newWave.m_nid;
     m_cid = newWave.m_cid;
-    m_tp = newWave.m_tp;
   }
 
   Wave &operator=(const Wave &newWave)
@@ -51,7 +51,7 @@ public:
 
   ~Wave()
   {
-    delete m_tp;
+    delete[] m_tp;
     m_tp = nullptr;
   }
 
diff --git a/src/wavetable.h b/src/wavetable.h
index 300a5bb..ac27ca8 100644
--- a/src/wavetable.h
+++ b/src/wavetable.h
@@ -33,10 +33,10 @@ public:
 
   Wavetable(const Wavetable& newWavetable)
   {
+    m_wtp = new Wave[DEFAULT_N_WAVES];
     m_nid = newWavetable.m_nid;
     m_cid = newWavetable.m_cid;
     m_name = newWavetable.m_name;
-    m_wtp = newWavetable.m_wtp;
   }
 
   Wavetable& operator=(const Wavetable& newWavetable)
@@ -53,7 +53,7 @@ public:
 
   ~Wavetable()
   {
-    delete m_wtp;
+    delete[] m_wtp;
     m_wtp = nullptr;
   }