#236 environment variables fixed