Fixed: Envelope wasn't passed properly