Fix envelope and make results accessible