Improvement to wavpack fix