Fix envelope