fixes #5, usage of policy envelope generation