[us-commits] [ehb54/ultrascan3] c858de: fix vhw_enhanced to always save the right *envelop...