Added additional check for extra delimiter that can sometimes cause playback to fail?