fix for envelopes