Got rid of an edge case for envelopes.