Make extract wave more robust