Minor modification on WPWave class